Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resprites #704

Merged
merged 6 commits into from
May 22, 2024
Merged

Resprites #704

merged 6 commits into from
May 22, 2024

Conversation

Ratyyy
Copy link
Contributor

@Ratyyy Ratyyy commented May 17, 2024

Описание PR

респрайты кучи вещей
фикс мыльного пола
добавление лицензии на код
Проверки

  • PR полностью завершён и мне не нужна помощь чтобы его закончить.
  • Я внимательно просмотрел все свои изменения и багов в них не нашёл.
  • Я запускал локальный сервер со своими изменениями и всё протестировал.
  • Я добавил скриншот/видео демонстрации PR в игре, или этот PR этого не требует.

Изменения

🆑

  • add: Добавлено веселье!
  • remove: Убрано веселье!
  • tweak: Изменено веселье!
  • fix: Исправлено веселье!

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented May 17, 2024 •
edited
Loading

RSI Diff Bot; head commit 660baff merging into 4b9f008
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/ADT/Clothing/Shoes/Boots/magboots-ert.rsi

State Old New Status
icon-on Modified
icon Modified

Resources/Textures/Clothing/Back/Duffels/syndicate.rsi

State Old New Status
ammo-equipped-BACKPACK Modified
equipped-BACKPACK Modified
icon-ammo Modified
icon-med Modified
icon Modified
med-equipped-BACKPACK Modified

Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi

State Old New Status
icon Modified
off-equipped-HELMET Modified
off-inhand-left Modified
off-inhand-right Modified
on-equipped-HELMET Modified
on-inhand-left Modified
on-inhand-right Modified

Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi

State Old New Status
icon Modified
off-equipped-HELMET-vulp Modified
off-equipped-HELMET Modified
off-inhand-left Modified
off-inhand-right Modified
on-equipped-HELMET Modified
on-inhand-left Modified
on-inhand-right Modified

Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi

State Old New Status
icon Modified

Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi

State Old New Status
icon-flash Modified
icon Modified
off-equipped-HELMET Modified
on-equipped-HELMET Modified

Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Decals/Overlays/greyscale.rsi

State Old New Status
checkerNESW Modified
checkerNWSE Modified
fulltile_overlay Modified
halftile_overlay Modified
halftile_overlay_180 Modified
halftile_overlay_270 Modified
halftile_overlay_90 Modified
quartertile_overlay Modified
quartertile_overlay_180 Modified
quartertile_overlay_270 Modified
quartertile_overlay_90 Modified
threequartertile_overlay Modified
threequartertile_overlay_180 Modified
threequartertile_overlay_270 Modified
threequartertile_overlay_90 Modified

Resources/Textures/Objects/Specific/Chemistry/beaker.rsi

State Old New Status
beaker Modified
beaker1 Modified
beaker2 Modified
beaker3 Modified
beaker4 Modified
beaker5 Modified
beaker6 Modified

Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi

State Old New Status
beakerbluespace Modified

Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi

State Old New Status
beakerlarge Modified
beakerlarge1 Modified
beakerlarge2 Modified
beakerlarge3 Modified
beakerlarge4 Modified
beakerlarge5 Modified
beakerlarge6 Modified

Resources/Textures/Objects/Specific/Chemistry/pills.rsi

State Old New Status
pill Modified
pill1 Modified
pill10 Modified
pill11 Modified
pill12 Modified
pill13 Modified
pill14 Modified
pill15 Modified
pill16 Modified
pill17 Modified
pill18 Modified
pill19 Modified
pill2 Modified
pill20 Modified
pill21 Modified
pill3 Modified
pill4 Modified
pill5 Modified
pill6 Modified
pill7 Modified
pill8 Modified
pill9 Modified

Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi

State Old New Status
pill_canister Modified

Resources/Textures/ADT/Mobs/Aliens/CarpCat.rsi

State Old New Status
alive Added
dead Added
dead_mouth Added
gib Added
icon Added
mouth Added

Edit: diff updated after 660baff

@Us3rn4me228
Copy link
Contributor

Us3rn4me228 commented May 17, 2024 •
edited
Loading

У тебя названия некоторых спрайтов с метой не сходятся

@Ratyyy
Copy link
Contributor Author

Ratyyy commented May 18, 2024

У тебя названия некоторых спрайтов с метой не сходятся

да, уже коммит с фиксом пропушила

@modern-nm modern-nm merged commit 694c165 into AdventureTimeSS14:master May 22, 2024
11 of 13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@modern-nm modern-nm modern-nm approved these changes

Assignees
No one assigned
Labels
Changes: Sprites No C#
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Ratyyy @Us3rn4me228 @modern-nm